Merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 27 Apr 2006 08:32:28 +0000 (09:32 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 27 Apr 2006 08:32:28 +0000 (09:32 +0100)
commitb754b50322a5e30ae396188e3f31e616f74ea6f5
tree1ef7b98607d7064a125e787ae743f7f50e6be04e
parent9e385cdd2fce38b43a5ac1fd0f2ea0e8745abd1d
parent60395c1ca994f0c1ce83ff7fe19362f76c3ff3d8
Merge with xen-ia64-unstable.hg